Enhanced NCP Support